Merge commit 'jdeseno/remove-deprecated' into update
authorAlex Crichton <alex@alexcrichton.com>
Tue, 21 Oct 2014 15:34:23 +0000 (08:34 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Tue, 21 Oct 2014 15:34:23 +0000 (08:34 -0700)
commitdde46beba254eb92f7179843ac7543e4b8323b65
treef1382678b20f4daaf741e150dc4e271a10449965
parent481a4336c477e0ae5c6cb226d0f43fd178a95a49
parent23492305cbbbeef55b9c416b5d2c4c06007ee81c
Merge commit 'jdeseno/remove-deprecated' into update